From f154ddb585372be0878dbdad494ac8454dc4cb2e Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 5 Nov 2008 10:25:11 +0000 Subject: [PATCH] x86, hvm: Only warn on memory attribute conflicts for real RAM. From: Disheng Su Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/mtrr.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 77f31a6f7f..7344576f16 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -392,12 +392,13 @@ uint32_t get_pat_flags(struct vcpu *v, */ if ( pat_entry_value == INVALID_MEM_TYPE ) { - gdprintk(XENLOG_WARNING, - "Conflict occurs for a given guest l1e flags:%x " - "at %"PRIx64" (the effective mm type:%d), " - "because the host mtrr type is:%d\n", - gl1e_flags, (uint64_t)gpaddr, guest_eff_mm_type, - shadow_mtrr_type); + if (mfn_valid(paddr_to_pfn(spaddr))) + gdprintk(XENLOG_WARNING, + "Conflict occurs for a given guest l1e flags:%x " + "at %"PRIx64" (the effective mm type:%d), " + "because the host mtrr type is:%d\n", + gl1e_flags, (uint64_t)gpaddr, guest_eff_mm_type, + shadow_mtrr_type); pat_entry_value = PAT_TYPE_UNCACHABLE; } /* 4. Get the pte flags */ -- 2.30.2